merge trunk
authorKenichi Handa <handa@m17n.org>
Tue, 1 Nov 2011 00:57:38 +0000 (09:57 +0900)
committerKenichi Handa <handa@m17n.org>
Tue, 1 Nov 2011 00:57:38 +0000 (09:57 +0900)

Trivial merge